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

Change-Id: I33811f8c6198da52d7ec5a863528e8c6ed723f2d