Merge changes from topics "128455935", "123661746"
am: dc4cb81c83

Change-Id: I4b169adb007ecff072770f55490bac8b5c30b4c5