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

Change-Id: I7012673fdf97ddaa5bad49387b3d974ac72daa02