Manual merge of review.cyanogenmod.org/#/c/27689/1

Should fix build issues related to Phone.java

Signed-off-by: jakew02 <jacob.whatley91@gmail.com>