[automerger] Merge changes from topic "am-128361686df44cf9941f696c8a613f42" into mnc-dr1.5-dev am: 6e4c870d0a am: 105295f24b am: b8b727d04a

Change-Id: I3d70e03c7afcd4ef9a5d9fd74c10b06bd187d9aa