Also correcting a typo ('s/activtion/activation/'). Change-Id: I878fdde5612c4e91eb609290fefd51946d215ac8