Merge a3a5c49222ba31054824f58c35c8aa1753636aa3 on remote branch

Change-Id: I9586d5c1ad9c6488d4407d888170d1919e8360ff