Merge "Fix appData field type" into pi-dev am: c13787262e
am: 861953574b

Change-Id: I9b6790bcf3bf121262b9c282ec20df8944f21b09