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

Change-Id: I7e4be3b21f30847b29fbd1ff66504c353fc795e0