Merge "Merge "[view-compiler] Better namespacing of util functions" am: ff77ea8d am: 36c39533 am: b63e813f"