Merge 8107cff0821e19f7219ac0140daabf9dfda0496a on remote branch

Change-Id: I6e575704fb4785015f58390d093f45a03e4b7b94