Merge "Add manage mode workflow for ExternalStorageProvider" into rvc-dev am: e0ae189f am: d0772d27 Change-Id: I54949ed04b24f2fba1078ab0669b13eb2a734e6c