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