Merge 34cc20762944c325819de775cb2cf02124277827 on remote branch

Change-Id: Idc4966af63d957c06e6c50959897b7b90c3a3ffe