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

Change-Id: Iffbf1889701bd82f94a337411a31dacdb816243e