Merge changes from topic "118349116"
am: 90f496b14c

Change-Id: I34e02179d9718acf9bf00bd500f535e36c3c7804