Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into mnc-dr1.5-dev
am: 99e9aa28af

Change-Id: Idba1942f04f1bbd5a32062f6122fe0d8731c653a