Squashed commits from CM/Team Hydra

Change-Id: I57e34e8febd57033a7c35642aaf34ec8029f4cff