[automerger] Merge changes from topic "am-325cd506-a538-4cb7-a65c-bc30576c59e9" into mnc-dev am: ea4aaca2 am: 86e63447 Change-Id: I5e975c746de8bae58ef8110863b016140d5ac55b