Merge "Add file_contexts for 8994 UFS storage support"