Merge 70161e7400f5cba09a5bd970ed3fe6e8a652dcbc on remote branch

Change-Id: I2f94f4822394346d559ea60c271994a1b4bb1a56