Merge 16feaeba879adc73a5784cfaeded16b3d2c8eb8d on remote branch

Change-Id: Ibfc3241cc6aa21293a1befea2da8914feb0f4a95