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

Change-Id: I6d3d1575091f296148f3dbf2504e2895bf18c9d9