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

Change-Id: I99f6eadac7e431a335ef620a0d953a2ab4e3fb8f