Merge "Change priv-apps /home/home labels to privapp_data_file"