Merge changes from topics "embms-cts-6", "embms-cts-5" am: f6b2b77e40 am: 2cd6464e9b
am: 8fd59b38b7

Change-Id: I1217efc28d9d9c825dd9bf361d7f2f35510b4b27