Merge "Returns null not empty string if MEID is not available"
am: 634c108060

Change-Id: I75230fdc0f1014f5fc5d3e986c951bf5ece4d545