Merge "[NAN] Make parcelable class final - per API linter" am: 3fcabac35a am: 5a07e3b2e8
am: eb1c7afdcf

Change-Id: If0f1f4de0fd28c0c65cb46bd958b99f76fed854b