I will address the dependencies on MW core in a followup. Bug: T339184 Change-Id: I892364b0c9f15c9de4cfc29c683670c172d71764