Merge "Fix NPE if default supervisor is not defined" am: 9bc3b6a207

Change-Id: I74e93eca610194d7251c596bb854446bbc3dc129