Merge "Sync with upstream up to 0d367b12:"
am: fa304d06a2

Change-Id: I749305bce86394206a83958ffbe669b84f3f9ec5