Merge 77796d95042b67ba2dcf77b2c98f95e74cea4d3a on remote branch

Change-Id: I6213b45faa1ae4c015b527d48c0e743e6f8959f4