[automerger] Merge changes from topic "am-8231d92f-aea1-4f7d-b84c-789126fb6fa2" into mnc-dr1.5-dev am: 3834932c am: be3c918d am: 61a27341 Change-Id: I4bae91cb587a679071a777de16f5a04963832308