Merge 21c68f9208a03cb41604133850d8c7100c6d0602 on remote branch

Change-Id: Ie9b867808ab32663ae9e9ab462cdbea8edee139d