Merge "Add checker part of test, fix intrinsic copying"
am: 921c5f9479

Change-Id: I8a79599ac7e3ca15ea1818e51cac4d218c18297d