AOSP r7 tag

Change-Id: I8d1b69013cadbdac34570ab26d0b77f68e2b32da