Merge "[Manual] Fix static field names"
am: c0c914dfdb

Change-Id: I3b96a76009f80f28f5a51fa91090cf28d70f5246