Merge changes from topic "am-128361686df44cf9941f696c8a613f42" into mnc-dr1.5-dev
am: 6e4c870d0a

Change-Id: Ia8180d576ddfc171aafef7b3b0cc9ecf0aa3b7fd