[automerger] Merge changes from topic "am-325cd506-a538-4cb7-a65c-bc30576c59e9" into mnc-dev am: ea4aaca253 am: 86e634471c am: 554bfb8e51

Change-Id: I0872f20d367b7991ca031176962f9820aa02fc46