Fix public variables to not have 'm' prefix

Bug: 181704764
Change-Id: I89e43ce6cc74119514c8124e7cc61b11dc475f58
7 files changed