Fixing cafe deprecation issues for Meniscus

Change-Id: I9bda6dc20792203986256be2c980c7b4e73e77c9
Merge "Fixing cafe deprecation issues for Meniscus"