Merge "Handle NullPointerException during getIccId" into tm-dev