am 4bf4e4c8: Merge "Make Paint a required field of StaticLayout Builder" into mnc-dev

* commit '4bf4e4c80181cd7c4e1a9d26c443dd1d529455e7':
  Make Paint a required field of StaticLayout Builder