This is more readable and will help with animations going forward. Bug: 7600384 Change-Id: I255598d860d1e451fef106b00da63c282fe95f95