Merge 7f4eca1ac49d9c7fc88cfa5f547ca09c7b5eace3 on remote branch

Change-Id: I0655303d151eeb08ab192815d0fa9efa875aa80c