Merge a57f9a69f0498769178d36262c2d3e0a2130b302 on remote branch

Change-Id: I373f77fa3921bf1da4e532c9149c7425b083a191