imnj: Update based on the HTC One GE commit