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

Change-Id: I9bebe24f2c65ecaf31b70e02a45e0acd50e1430e