PA for bionic

Change-Id: I96ee7d454cf8c2eee72a37e4d82d3514263622cd
Signed-off-by: Evan Anderson <evan1124@gmail.com>