Merge "Add message template support for checkStringNotEmpty" am: 0d0bfc92e8 am: 1c28a1aa35
am: 270dc6ab35

Change-Id: I210058d65ed329265bb5b2bb5371f0b8098eb4b3