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

Change-Id: Ie79dfe42049354c3bb60de9e9987fc8c75167f30