Merge a928e9b68d6d04f41152fb0a4faeb22dbefbb8b2 on remote branch

Change-Id: Ice74b681f4a65b6e5c51e17af6a1043c7367d76f