shamu: Rebase to CM

Change-Id: Iedd08a74afc86440869f3979b227b39421983630