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

Change-Id: If7c5677294f6e6b7a32eb83055b8b76603a092f4