Merge changes from topic "am-8bc071db8b624014954ef1c5977388bc"

* changes:
  [automerger skipped] Merge "Merge tm-qpr-dev-plus-aosp-without-vendor@9467136" into stage-aosp-master am: 69cd53b1da -s ours am: da561b8a75 -s ours
  [automerger skipped] Merge tm-qpr-dev-plus-aosp-without-vendor@9467136 am: 655560a776 -s ours am: ce2b7a50da -s ours