DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into stage-aosp-master am: 507f2c0b4c

Change-Id: I606ef2945b7ae44b9830e00654b219d259b77264