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

Change-Id: Id4c2bf04e877664188c8fab2905601d6f431cfde