Merge "P is for PAINT." into pi-dev
am: bed68535c0

Change-Id: Ibf1f14dea6efd09f5d2777d663bdfa69254d572d