AOSP r6 tag

Change-Id: I0c78b2a75b20a0ae1eb44e1a1887efc63468a9b6