Merge "Fix bad pixel out-of-bounds filter" into pi-dev
am: c3a7ab321b

Change-Id: I3f1658f81c6735c79511f8544ebdc6212f82a96b