Apply changes after migration to upstream.

Change-Id: I238ddc9d9461402d15509bdacba7fee22ebf900b
10 files changed