Merge "Merge "Add MOUNT_FLAG_VISIBLE to visible stub volumes" am: d8e3e072 am: eba787f7 am: 81871978"