Merge "Devices with UDPFS shows lock icon on AOD" into sc-v2-dev