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

Change-Id: I450fba127e4a722a730d1319b0070ad0529a879d