Merge b367a24706b9b3dd5065b0d5d20ba1a8974c80e4 on remote branch

Change-Id: I0b7526c68d1ff262112d330212cd5ed315768556