As far as vanilla 2.6.0 is deprecated, we should remove these code Change-Id: Ib8756d5083a5630d6f746d4ab79251d105cf4116 Partially-Implements bp: deprecate-plugin-vanilla2.6.0