Merge "AOD: More VisD updates" into oc-dev am: 67ee79e84f
am: 1ac141639e

Change-Id: I2216b17f6a2dc585e088940d405ab2d42552acad