am 99bcc3ee: Merge "Revert "Revert "resolved conflicts for merge of 47249f2a...
am 99bcc3ee: Merge "Revert "Revert "resolved conflicts for merge of 47249f2a to mnc-dev""" into mnc-dev
* commit '99bcc3ee':
Revert "Revert "resolved conflicts for merge of 47249f2a to mnc-dev""