am d2e09e98: am d771fb2d: am 7df8413b: am 2cb1289b: am 3b5bec15: Merge "Shamu: NFC: Create /data/nfc only on post-fs-data." into lmp-dev

* commit 'd2e09e9800fcc4ea2688cda397d837f814f48be8':