Merge 6113b185f509c32ec49c9f8f953f630a9e0e45c4 on remote branch

Change-Id: I3b5a26d216b16b64121548e38f2839f4f17370b2