Merge "Modify PIP to use the magnetic target from Bubbles." into rvc-dev am: 1ff0d350 am: 0ca4ac22 am: 262e652c Change-Id: If5a6fd32a35afa84ccd01ac2bf45c40fda938954