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

Change-Id: Ibdf3220bf31aa5d9f667bf9e34680b38bd1ba000