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