Merge "[AWARE]Change default DW" into qt-dev
am: d23921925e

Change-Id: Id23acc664db17dd0228fbee136c53c172b7a9b17