Commits
Kristian Monsen authored 88e4b3ff90b
Final merge fix Fixing a crash on reboot. After this it builds and cts tests passes as before. I don't have a device locally so can't see if it actually works. Change-Id: I56cd09d5f83f8096ba0fe8aa8e93ca4286f42e3a