Merge "Fix String is empty issue" am: 80af1ba47b am: 38c585cb8d
am: d7df704d98

Change-Id: Ia75039c87b396b8b0d15f0758d17e365fb2f18e6