Merge 34cc20762944c325819de775cb2cf02124277827 on remote branch

Change-Id: I5ef29632de89c4a9a27d7d5b080d2cf9189d6577