AOSP r7

Change-Id: Ie1e46f593f23edb37e3da1a0ef69b0b597f497b1