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

Change-Id: Iaa1ec80f0de511475c28872980311ad0e67b25b0