Merge "Add some useful helpers and constants." am: ed8d236319
am: 0f4421873e

Change-Id: I2f7f4f69dcb4bbb1641af70a26ac95b1bb659ce8