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

Change-Id: Id3581bfec0e9dd780ab34b3d6b4d3d24d26b253b
tree: 3e4059b0fcf350b58a95cb23e1d4adda48064468
  1. LoopbackApp/