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

Change-Id: Id5a122582ec1fb1af8e79721777d0acdfefdc284