Merge "Sync with upstream 41655e1c:"
am: 78d19b2743

Change-Id: Ica451d3c168a093e76a000b152ce0f0747eaebfb