Merge changes from topic "am-7424efa6-0590-42df-bf56-90682a2c4f31" into mnc-dr-dev
am: 1d98dc05a5

Change-Id: Iebc4d9e483734a233e6cd417481a89278d343f3a