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

Change-Id: I24971da5290ecad39e9008196f3e064074644c96