Merge a3afa4603ab89f2244bc57b779446eefe293ffdf on remote branch

Change-Id: I6d9b5ef079eaa33b3ae011f5a0af9ecd857eff17