Merge "Merge "Fix regression, show internal storage option..." into nyc-dev am: 9a76143ef5" into nyc-mr1-dev
am: 2849e26e83

* commit '2849e26e8395eeb445ebfdaf2f542f76d6af73c4':
  Fix regression, show internal storage option...

Change-Id: I08b8abb39f15076859401da8d3d25ba15d4d7ffc