Merge "Removed compatibility function (was left in before to not break the build) Bug:2501468"