First: localization tool can not recognize id because
of empty line between id and its definition
Second: same problem because of comment between type and id

Change-Id: If42af406fab252ccae0a6bbc478bab8130210b21