Merge "Consistent naming for internal storage APIs." into nyc-dev am: 406e9d44fd
am: 3b23e1bb8c

* commit '3b23e1bb8cc2a6e828d620934ce87a3761db1a69':
  Consistent naming for internal storage APIs.