DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master
am: 335a562129

Change-Id: I519b8dcafd4d92bbd6599c56c1b896daee7303fd