Updating meniscus supporting classes after more product changes

Change-Id: Ic08deed1eb0cab879f4c7d0a624a676bd18f7420
Merge "Updating meniscus supporting classes after more product changes"