Second attempt. Still need to add strict mode violation checks and logging. Bug: 21901286 This reverts commit bf33bd4d. Change-Id: I5d73343544c32ce4fc4c377ba44db8e677a1287d