PhotoPhase from CM (2/2)

Change-Id: I907429bb5105be23f97fba59a8f0342e292c8825
Merge "PhotoPhase from CM (2/2)" into kitkat