Merge remote-tracking branch 'github/master'

Change-Id: Ic4c0780eb99cd2528ab04cd9610f66f00daca964