Add comments, catch empty strings

Bug:8015123
Change-Id: I4886b3006cfab704f3d207d7788d2db0dffbbae9
1 file changed