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

* commit '9cbb71997b10843cc5e5de9e4ec4e3c70a739bdd':
  Fix QS RTL

Change-Id: If68a625134f33df9ebac19b6b91e050c97da0d00