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

Change-Id: I0223b8bf318059792889219a77372a94ca7383d4