Merge to upstream r221532.

Change-Id: I24323ba23e54074d82e470e7d59ea7b9b5ffa919
30 files changed