Merge changes from topic "am-b89fd127-e87f-4013-8a91-d8bfa01a2650" into mnc-dr-dev
am: 4773895ad6

Change-Id: I77c5d70f06f1a1d9297232eda7e885ba727f5a4c