Merge "Only disable trust agents after lockout" into nyc-mr1-dev
am: f6487b63a1

Change-Id: Id59329047a2857697d3611cd4179dace742364c3