I AM AN ANDROID!!!

Change-Id: I7747ec9c1d0b91e76220c0c539e93726afd9da77
Merge "I AM AN ANDROID!!!" into jb4.2