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

Change-Id: I1c740fee4e612253098aa56ebdb70dafc83c6f43