Follow constant refactoring in framework.

Bug: 25796509
Change-Id: Ib19aa570fb5fbf26752c5487f1221c9959b1143a
2 files changed