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

Change-Id: Ie4e6e94ea6feabfeac0d644f790f56416313dd54