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

Change-Id: Ie527f041c16fcd99964bff6b3febeae8d3970d51