Merge "Sync with upstream up to 0d367b12:" am: fa304d06a2 am: 686b91faf3 am: 46dbbd915e
am: 540f1a8abf

Change-Id: I2e25f101427989b501c957cb6a67021960fd0670