Merge 35b68a4500ba3cbfc65875f4396bb6098c724778 on remote branch

Change-Id: Icef5cf85fc857e5c48d0a50af1dea1e2fdad8a88