Merge "Add a test that we get samples for a common core-oj method" am: 5a883e16e8 am: 4616df8a03
am: 2df5baab19

Change-Id: I7e78e3fffb535958a79be6401199f6e3df767305