Updates following codename13 repo rebase.

Change-Id: I8dc8b5b5e1ae89cf94f1f735769ada3b762c0771