Merge "Add quotes in empty check."
am: cb79f2c003

Change-Id: I7b62a15dc45151f47924b99f052df3ca059acdc9