Adding some missing messages

Change-Id: I84d60b056cacf79e2cf54d7bc7227f564bc963d0
Merge "Adding some missing messages"