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

Change-Id: Ia9747f53a1a88c8c9dfb30f554416e5161ffdbf7