Merge "Fix default keymaster so it doesn't start an extra thread." into pi-dev am: d5a5888c60
am: 352bca5777

Change-Id: If462fb4c9a95cf58da36dea2c63e3f30f77b0bab