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

Change-Id: Id769353ac251015fbd3af2c5e0134c5de5b418d4