Merge 3027b2407fcad80bc8d707e9f3b32106aa246f45 on remote branch

Change-Id: I911d339a77ba9a01dbc9c1d61999f2a79f3aaa15