Merge "Update BaseBundle to not use LazyValues when using ReadWriteHelper" into tm-dev