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

Change-Id: Id1fdc09dd05d93f83557d121decc338f10202410