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

Bug: 120848293
Change-Id: I17fbf82f23fe647c3b062f05d93c9bfd75ea5616
tree: 256d681c8a15165facd99993a5373518ba45c596
  1. amber/