am 1a556b99: (-s ours) am 17c5e990: Merge "DO NOT MERGE Hide banner manifest attribute." into klp-modular-dev

* commit '1a556b996156b71bdbb60f6f9cd7bd3e16947a4f':
  DO NOT MERGE Hide banner manifest attribute.