Merge 905e30c35f427cde04d24de70949c94e80897780 on remote branch

Change-Id: I3136cbfa6e3cdd76971eaf4d2075db19a7831c6a