Merge "Fix build aflter conflicting changes got in."
am: 07f7affb33

* commit '07f7affb338b529d34e4e18b7e8a631c16bd9765':
  Fix build aflter conflicting changes got in.