Merge "Add new extra for identifying an intent coming from storage UI." into oc-dev am: 676bd21542
am: 9596d71664

Change-Id: Iacac793eb8b12cd11e39d2018cb3c1d30a29952f