Merge "Revert "Enhancement for OnInfo callback on DRM Framework"" into klp-dev