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

Change-Id: Id6a32cf300b7a132ab712c986c4725bfe5e6026d