Squashed commits from CM/Team Hydra

Change-Id: I2720e7282a2c9d6a9efcb51dc685e27b522e0152