Merge "Sync with upstream 95647bc8:"
am: 20ad1ebc31

Change-Id: I1dd17c9021a7d712764b777bbb4efa5bf16faa4a