18.3.1.C.0.21 blobs

Change-Id: I626315e96515ceba09252de497b77953c888ca47
fix mounts

Change-Id: I63a533407cbab0ec6ebfb0602a5ce98170175f27
Simplify DS device

Change-Id: Idd344a695ef1ec878613513cffe46b974f01cc87