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