Add Shamu

Change-Id: I266690a014905eb4f46b5aa79fabca2a9cfd242b
Merge "Add Shamu" into to-5.0