Merge 7a9e351940185163533f32fc415accdfc77dbc21 on remote branch

Change-Id: Idf8125fe8891f238c86c458c5074c1b43ac12ced