Merge changes from topic "am-30695673681a430e9c5896e3258d3047" into mnc-dr-dev
am: 8ce83b6174

Change-Id: Iff4f767c0505a9f1ae7b94015a5e7909d02cc505