Merge "Validates Intrinsic Blur only takes 2D Allocations" am: b44f4d2f51
am: 0962a6e83c

Change-Id: I0b3c582cc9627567b4942eead98cdb0a2406d7c6