Merge changes from topic "am-9ce0d868c2a9496188a012d3ef43ba41" into mnc-dr1.5-dev
am: eac0551992

Change-Id: Ia7fedd1202e9250d27d16dc3327b7664b134ae1f