Merge "Return "" not "null""
am: eebbd2b639

Change-Id: I6b4df3293ee59aa7d0798c840fb3a6131db70645