Merge db133095539979a2ee6763c70fca566ccddd18c2 on remote branch

Change-Id: Ifada760c0729ef739ffa66733d2490973c30db78