Typo fix + conditional fix

bundleTitle['message'] defaults to empty string, it would never
be null, should just check if the string is empty

Change-Id: I6b9dd8b8a94fed114c0799004848daed472daf3a
Merge "Typo fix + conditional fix"