Merge 8800ffb95bc25737e1deefba7547a8468309967d on remote branch

Change-Id: Ifca3436a08d0d89e4f998ff4345311234519a132