Merge "Enable keymaster3"