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

Change-Id: Ie62535304ba68db625aa075c28273b5aff84b228