Merge 16f8a6b8b63bcdc1a99e719a9e08b53ec44680e2 on remote branch

Change-Id: I08fb03fc5607ed7aa0840bfcac41f55de458d606