DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6382244 into stag-aosp-master

Bug: 151763422
Change-Id: Ib0e04b2f16105fad6be0165974ad41d3f5b26882