[automerger skipped] DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6304901 into stage-aosp-master am: e157c9d789 -s ours

am skip reason: subject contains skip directive

Change-Id: Id7cc7b2be596b49bb72455ea23416657e2ef3a90