am f65e05a5: am 81cd6c4b: Merge "Take care of invalid mcc first when updating...
am f65e05a5: am 81cd6c4b: Merge "Take care of invalid mcc first when updating time based on nitz." into lmp-dev
* commit 'f65e05a5':
Take care of invalid mcc first when updating time based on nitz.