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

Change-Id: I8b7949009b9e6de95ac5effc4c3f51d16232ce07