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

Change-Id: Ic0a809c865d5bc4546483fff5dc34609ab024915