Merge 2531ff66b0391a5a44e1c58eccca039bc45363a4 on remote branch

Change-Id: Ie97687fa9894498bc704ff610ed2ece2202d7795