Merge f03689aef52981ff254832ddb8a6d83b0aeaa2d0 on remote branch

Change-Id: I12f1ad434dc7764195eecd85f66b34127d5d2632