Merge "[NAN] Make parcelable class final - per API linter" am: 3fcabac3 am: 5a07e3b2 am: eb1c7afd am: ff64f55a Change-Id: I8ae44b6f28d8e6a2c7e2e311b8404d6d089d4f50