Merge changes from topic 'vhal-def-refactor' into oc-dev
am: ccc1d2e736

Change-Id: If3ebe7e1c54a2bc68b4ba0065ba3b62eb158b02e