Align tree and complete rebase on top of CM tree.

Change-Id: Iacf1e9604c5a0f838d0d86ce9b1d6735e9b748b8