Merge branch \'klp-modular-dev\' of...

Merge branch \'klp-modular-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/packages/apps/Nfc into klp-modular-dev am: e8314992 am: 19108b58 am: 63280fe6 am: f96895a2 am: 740e0726 am: 7390f09a am: 755d0a2d am: 8d04aeed am: f931ee94
am: 259df7f9

* commit '259df7f9':