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

Change-Id: I7f41b40c8b393ebb8a22efe7111b2ddf75a88368