Merge 688119e26c6ded9c4b0f4d78684c25eba94b9214 on remote branch

Change-Id: Ic0d71774f5d09f2903ed66c30a61a37c98891518