Merge changes from topic "am-8cd2288f-c3e9-422f-8fde-02d5b6100d12" into mnc-dr1.5-dev
am: 1c198dfc71

Change-Id: I26d40e2d2dd918f8dbe7b8b688f2834808c240c2