DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master

Bug: 120848293
Change-Id: Ia18e356927c6bb51897393292d9e59054b672879
tree: 4b92f07c4dc76f1feddb9c162f2d89436682f476
  1. LoopbackApp/