Merge 8499b6023b48dc710c530b50907d74e1474b7453 on remote branch

Change-Id: I3c17d8c456985f3e846d26e798f115576dbeeb27