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

* commit '96a9c9b5896aa6a8a956cc5fffca3f98b8c155c0':
  Make Paint a required field of StaticLayout Builder