am: 406e9d44fd * commit '406e9d44fd7c401c9352a9b40e3e0c0f428847fe': Consistent naming for internal storage APIs.
406e9d44fd