Merge "Fix QS RTL" into nyc-dev am: 9cbb719
am: 94c4e9f

* commit '94c4e9fdecebe93370eb1e138bb8f1a0ac04eb6c':
  Fix QS RTL

Change-Id: I53ac6fcef062f23521533ce160edc9d2549f8375