Merge "Add Sub-ID-from-phone-account converter method."