Squashed commits from CM/Team Hydra

Change-Id: I27790fd493182efe283a4d53bb6322c33d2aa66a