Merge 91da91c4e1e6ee2fe2e0a62116beed18d2d65646 on remote branch

Change-Id: I58ef105f6c06e227b7a0e4e78866c1874844d4e9