Merge changes from topic "b66921961"
am: 10b76c15f9

Change-Id: I2f26cb52bd0597ca29ffcbe23299b4ff721d2388