Merge "Returns null not empty string if MEID is not available" am: 634c108060 am: 02445f14da
am: 7a318f0646

Change-Id: I41b8c9de8c7bd0c2a93c9f8444e77af84c50c293