Merge "QS: Fix RTL handling for listening" into nyc-mr1-dev
am: 1b7e4b445f

Change-Id: I5956aa83c43d4286c6708af32ecda4800f802b02