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

Change-Id: I9e85d16bd3edc529a97e4df3b8f90e9fdb2ee486