Follow our own Janice

Change-Id: I28c1ebb0995296acb108e215ef06ab9165a75ef6
Merge "Follow our own Janice" into kk44
4.4.4 probably break stuff

Change-Id: Icca4c20e976c7dec5e4575a77e144a4b4062e589
Merge pull request #1 from VanirAOSP/kk44

4.4.4