Merge 7d45ce7de5f90c4ed0afbbae803476496163f67c on remote branch

Change-Id: I955a399669d292bd4a16af7b563b41ce466473e5