Sync with internal changes.

Change-Id: Ifbbb97bb7b2f58ae06f86ee86bbce9e55d474f74
Merge remote-tracking branch 'upstream/master'