Merge commit '7d58ca1adae7be6b6a8c85b318a96236b61572bf' into HEAD
Change-Id: I480e00a67df838ad18465e914f4f7c29df886e37