Merge bb14ba96b440aa616cdd6026cf7d4a087945d405 on remote branch

Change-Id: Ic30f328ff26ea54215af384d4bc225dbecc34a39