[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: 82064b902d -s ours am: ba60055149 am: 3542e0b1fd

Change-Id: Icf52d3d93c3113174746b69c588458b0f09d2dfa