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

Change-Id: I48992b03e5ecc16d58608bae47e8262601a38a87