am bc7eb40e: Merge "bug: 21208382" into mnc-dev

* commit 'bc7eb40ebc5463cc83f96b470036972dd8c1bd73':
  bug: 21208382