Merge branch 'stable-2.15' * stable-2.15: Remove explicit dependency on PLUGIN_DEPS Change-Id: Ia18d8a704bbb79af24d0dd27b84ddca1b805e4e1