Merge "Add a few cases of non compatiple d8 tests" am: b0be495b86
am: b38f108bae

Change-Id: I5cdbaa5cb8d1485b2a580d759a066f08697b93f3