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

Change-Id: Ib28a3bb8869dc400206d20d787522627b3b374ea