[automerger] Merge changes from topic "am-5291fbc5-4703-40f7-83aa-7828fdb2b7fc" into mnc-dr1.5-dev am: 909534fc am: 819b93d9 am: b6542712 am: 45b15934 am: 60604589 Change-Id: I118bf9ea20385e23ba8131ca5c2b9926c0aee29d