Merged several updates from googlesource