Merge \\"RefBase: Silence compiler warnings\\" am: f76ca2a43b
am: 3b43562535

Change-Id: Ifc19df587c4f0ef993200fdb6757fe3f3813bc67