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

Change-Id: I5d1434d1c1c8cc5b5f9b168252e345a3b132b7ba