Needed by Skyrocket

Change-Id: I5e577fd2add849c87447f222a63601e89456aeb4
Merge "Needed by Skyrocket" into jb4.2