05f7979426
With I56cd63057cc771310b69c311d975e06f73c773f7 now merged, the correct variables need to be used to ensure that they match. Related-Bug: 1625053 Change-Id: Ib82b6703655dca35e6eff759ec966e715cceb45a