This contains all of the changes from b54aa51 to 791e51a on mnc-dev, except the changes to tests/tests/security. Bug: 24846656 Change-Id: I01f53a1a238ac49f86928e0e22796dc73e0e34af