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

Change-Id: I0eb7f491686f78a4cec6cfe624d4febeecc6a3f3