Merge changes from topic "am-8231d92f-aea1-4f7d-b84c-789126fb6fa2" into mnc-dr-dev
am: ef5bc92259

Change-Id: Id780ff2be9ed2b5a1b532cad279ab71f0a33c651