Only minimal changes just to make it work together with the other plugins. Bug: 28908572 Change-Id: Icac226b45e8a6885036466451d0e9f54a3b3c640 (cherry picked from commit d97fdfd943295ea90d37b092e66b7ad1701587a1)
Only minimal changes just to make it work together with the other plugins. Bug: 28908572 Change-Id: Icac226b45e8a6885036466451d0e9f54a3b3c640 (cherry picked from commit d97fdfd943295ea90d37b092e66b7ad1701587a1)