am 6b355fea: Merge "Build Breakage in branch: git_master @ 2265859"

* commit '6b355feae3fe04847f9ea267649eca366b6cf85c':
  Build Breakage in branch: git_master @ 2265859