Merge 69e870cb4b446291abb905b5e3c50c2767abfe44 on remote branch

Change-Id: I836c21f3775871bacef353113cc2761c17535c67