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

Change-Id: I7a7194be0056c860569e9b7b23529b7a65de4b4f