Merge changes from topic "switch_module_prebuilt_qt-r1" into qt-r1-dev
am: 9796b347e1

Change-Id: I3923a802b0623d7be27449531ccb57583ce62518