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