Merge Derp

Change-Id: I33a1f626135471fa57fc87e42bb2fe0cb28e1bcf
dismiss keyguard : fix derp

Change-Id: I5d74013168ae2c1e7ffd2919b9f950dd23e89061