Merge \\\\"Add test for RefBase etc.\\\\" am: dc9fbc3440 am: 2b67ca305e am: 3531da94c8
am: 7bed68c596

Change-Id: Iedc7e0369258c6c108a5b8cc9851e173da7398e1