Merge "Fix doc flag for device having multiple storages" into oc-dev am: adfefc39e1
am: e95b4b1cf6

Change-Id: I9abf505f65a23cab91e08b4b13792800837cc888