Sync with upstream 95647bc8:
am: 09980abea7

Change-Id: Ica63752553b101d41486cb958076af5db6ba17ba