Merge "Follow-up to I7d96ca46a41ec764984be5fe42d225cb94f53497" into mnc-dev