Merge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650" into mnc-dev
am: 371e4fc283

Change-Id: I1e9abee95a7361acb06a447f0838a79c49b03d4e