Merge "Add derive_gid flag for mounting sdcardfs" into oc-mr1-dev am: 47c5929bb5
am: 2d7de53a73

Change-Id: I9acdbe4a2b790371fbabaef19559e18fbc4cf16e