Merge "Change tmp dir to /data/system/users/0/fpdata/." am: 3f4e982fbc am: 05a6820b76
am: 245ae95aa1

Change-Id: I351a9f8bd8c4b7eeb311c4379f3ee21860ea0e3f