Merge "Follow up cleanup" into pi-car-dev
am: 6fa6c39ecc

Change-Id: Ibdf34392171820de4c1d597bf4141a5188714626