
Change Id92251243d9e92f30e466419110fce5781304823 added API version 2.18, but because of a lot of rebases some comments and class names has incorrect API version (2.16 and 2.17). It may confuse developers in future. These mistakes must be fixed. Change-Id: I9719e9ddb3393f24976d1b5e4464e759daaa704e