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

Change-Id: I7653205fdf2cea6d5c0a73b2181142b6f7bae28f