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

Change-Id: Ie88590d0e098ef447c26cabb230cbf67aadcbb17