Oh Google... this is AOSP

Change-Id: I7d25fbef9dcbb892b6840af1538a6395857f9d28
Merge "Oh Google... this is AOSP" into jb4.2