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

Change-Id: I745f66fc63d03e2ccf03b47daae56f219252d87b