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

Change-Id: I5f46e5a80fe14f5f57c932c236457527092ca9c7