am 8c9a57fb: am a6e772c8: Merge "Follow-up to I7d96ca46a41ec764984be5fe42d225cb94f53497" into mnc-dev

* commit '8c9a57fbce955a836e01096f44a1d6cd8b2dec75':
  Follow-up to I7d96ca46a41ec764984be5fe42d225cb94f53497