Merge 6090d62a10b389dd3d389169ca28567db390b7f6 on remote branch

Change-Id: I3ba4954481204b7e65cc0d143685c3919a6e35ea