DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master

Bug: 151763422
Change-Id: Id9ba73c44b870ca1d648919c3ffac2455f057838
tree: d9cd353f97f44148529a04676a1eb3e051540480
  1. android-5.4/