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

Change-Id: I5ad8747c490bf655ced9f58ecfec2e9c3ed8c436