Some missing template messages

Change-Id: I61a5354b99b9a859385bfe5fcbb2330dcf6010e1