Merge 8ac036130549b770794208a03c2549ab28716b31 on remote branch

Change-Id: Ic69242e6eef4dac2fb1ac04ccb01dd3cc8e2eaa1