Merge 137edfcf33bf45eba1113890aa9d9b2e642575c8 on remote branch

Change-Id: I59cf61ca72850dce6c65bcedf626faf328eed9ec