[automerger skipped] Merge "P is for PAINT." into pi-dev am: bed68535c0
am: 69baf0d2a4  -s ours

Change-Id: I5bbc3a4461fbf6fcbe05b6465d1335f845f97c1b