M20171129-1700
PluginUnitTests Change-Id: If7da95aed16d90f6932639aaf47bf606081f470e (cherry picked from commit 7f92660f683f5cba60c72fea7082acbc3a9eafbf)
PluginUnitTests Change-Id: If7da95aed16d90f6932639aaf47bf606081f470e (cherry picked from commit 7f92660f683f5cba60c72fea7082acbc3a9eafbf)