Fix PN544 on/off issue on first boot.

Change-Id: I6e676f74a0bf717e0d23fc8ce32ce3918779eb00
Merge branch 'cm-11.0' into kk_mkt