* commit '99bcc3eee23ed8bd15bd108d068d6f9f694e4393':
Revert "Revert "resolved conflicts for merge of 47249f2a to mnc-dev""
* commit '99bcc3eee23ed8bd15bd108d068d6f9f694e4393':
Revert "Revert "resolved conflicts for merge of 47249f2a to mnc-dev""