Merge 330317a31a848a32dd52668907acf6055bd02794 on remote branch

Change-Id: Ie0daf7b118af58eec943e6dcba456c3eef8b496b