Merge "Build Breakage in branch: git_master @ 2265859"